diff --git a/internal/storage/errors.go b/internal/storage/errors.go
index 30384e21a..7cf6e8c0c 100644
--- a/internal/storage/errors.go
+++ b/internal/storage/errors.go
@@ -4,8 +4,8 @@ import "errors"
 
 var (
 	// ErrNoU2FDeviceHandle error thrown when no U2F device handle has been found in DB.
-	ErrNoU2FDeviceHandle = errors.New("No U2F device handle found")
+	ErrNoU2FDeviceHandle = errors.New("no U2F device handle found")
 
 	// ErrNoTOTPSecret error thrown when no TOTP secret has been found in DB.
-	ErrNoTOTPSecret = errors.New("No TOTP secret registered")
+	ErrNoTOTPSecret = errors.New("no TOTP secret registered")
 )
diff --git a/internal/storage/sql_provider_test.go b/internal/storage/sql_provider_test.go
index 6e235b553..9a71b7438 100644
--- a/internal/storage/sql_provider_test.go
+++ b/internal/storage/sql_provider_test.go
@@ -272,7 +272,7 @@ func TestSQLProviderMethodsTOTP(t *testing.T) {
 
 	// Test Blank Rows
 	secret, err = provider.LoadTOTPSecret(unitTestUser)
-	assert.EqualError(t, err, "No TOTP secret registered")
+	assert.EqualError(t, err, "no TOTP secret registered")
 	assert.Equal(t, "", secret)
 }
 
@@ -332,7 +332,7 @@ func TestSQLProviderMethodsU2F(t *testing.T) {
 		WillReturnRows(sqlmock.NewRows([]string{"keyHandle", "publicKey"}))
 
 	keyHandle, publicKey, err = provider.LoadU2FDeviceHandle(unitTestUser)
-	assert.EqualError(t, err, "No U2F device handle found")
+	assert.EqualError(t, err, "no U2F device handle found")
 	assert.Equal(t, []byte(nil), keyHandle)
 	assert.Equal(t, []byte(nil), publicKey)
 }
diff --git a/internal/storage/upgrades.go b/internal/storage/upgrades.go
index 25ee12fe2..ec93f3e36 100644
--- a/internal/storage/upgrades.go
+++ b/internal/storage/upgrades.go
@@ -19,7 +19,7 @@ func (p *SQLProvider) upgradeCreateTableStatements(tx transaction, statements ma
 		if !utils.IsStringInSlice(table, existingTables) {
 			_, err := tx.Exec(fmt.Sprintf(statements[table], table))
 			if err != nil {
-				return fmt.Errorf("Unable to create table %s: %v", table, err)
+				return fmt.Errorf("unable to create table %s: %v", table, err)
 			}
 		}
 	}
@@ -63,7 +63,7 @@ func (p *SQLProvider) upgradeSchemaToVersion001(tx transaction, tables []string)
 	if p.name != "mysql" {
 		err = p.upgradeRunMultipleStatements(tx, p.sqlUpgradesCreateTableIndexesStatements[1])
 		if err != nil {
-			return fmt.Errorf("Unable to create index: %v", err)
+			return fmt.Errorf("unable to create index: %v", err)
 		}
 	}