diff --git a/dbatools.psd1 b/dbatools.psd1
index 4a9785d9a2..22e008d104 100644
--- a/dbatools.psd1
+++ b/dbatools.psd1
@@ -115,12 +115,12 @@
 		'Test-SqlNetworkLatency',
 		'Find-SqlDuplicateIndex',
 		'Show-SqlServerFileSystem',
-		'Get-DiskSpace',
+		'Get-DbaDiskSpace',
 		'Remove-SqlDatabaseSafely',
 		'Show-SqlDatabaseList',
 		'Show-SqlWhoIsActive',
-        'Set-SqlTempDbConfiguration',
-        'Test-SqlTempDbConfiguration',
+		'Set-SqlTempDbConfiguration',
+		'Test-SqlTempDbConfiguration',
 		'Repair-SqlOrphanUser',
 		'Remove-SqlOrphanUser',
 		'Find-SqlUnusedIndex',
@@ -130,7 +130,10 @@
 		'Test-DbaPowerPlan',
 		'Set-DbaPowerPlan',
 		'Test-DbaDiskAlignment',
-		'Get-DbaDatabaseFreespace'
+		'Get-DbaDatabaseFreespace',
+		'Get-DbaClusterActiveNode',
+		'Test-DbaDatabaseOwner',
+		'Set-DbaDatabaseOwner'
 	)
 	
 	# Cmdlets to export from this module
@@ -147,7 +150,8 @@
 	'Restore-HallengrenBackup',
 	'Update-SqlWhoIsActive',
 	'Show-SqlMigrationConstraint',
-	'Test-SqlDiskAllocation'
+	'Test-SqlDiskAllocation',
+	'Get-DiskSpace'
 	
 	# List of all modules packaged with this module
 	ModuleList = @()
diff --git a/dbatools.psm1 b/dbatools.psm1
index 03c7897a6d..a0d7e2bcdf 100644
--- a/dbatools.psm1
+++ b/dbatools.psm1
@@ -12,7 +12,8 @@ Set-Alias -Name Copy-SqlUserDefinedMessage -Value Copy-SqlCustomError
 Set-Alias -Name Copy-SqlJobServer -Value Copy-SqlServerAgent
 Set-Alias -Name Restore-HallengrenBackup -Value Restore-SqlBackupFromDirectory
 Set-Alias -Name Show-SqlMigrationConstraint -Value Test-SqlMigrationConstraint
-Set-Alias -Name Test-SqlDiskAllocation -Value Test-DBADiskAllocation
+Set-Alias -Name Test-SqlDiskAllocation -Value Test-DbaDiskAllocation
+Set-Alias -Name Get-DiskSpace -Value Get-DbaDiskSpace
 
 # Strictmode coming when I've got time.
 # Set-StrictMode -Version Latest
diff --git a/functions/Get-DiskSpace.ps1 b/functions/Get-DbaDiskSpace.ps1
similarity index 95%
rename from functions/Get-DiskSpace.ps1
rename to functions/Get-DbaDiskSpace.ps1
index 8e0acdfa0d..0dda30222c 100644
--- a/functions/Get-DiskSpace.ps1
+++ b/functions/Get-DbaDiskSpace.ps1
@@ -1,4 +1,4 @@
-Function Get-DiskSpace
+Function Get-DbaDiskSpace
 {
 <#
 .SYNOPSIS
@@ -32,20 +32,20 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 .LINK
-https://dbatools.io/Get-DiskSpace
+https://dbatools.io/Get-DbaDiskSpace
 
 .EXAMPLE
-Get-DiskSpace -ComputerName sqlserver2014a
+Get-DbaDiskSpace -ComputerName sqlserver2014a
 
 Shows disk space for sqlserver2014a in GB
 
 .EXAMPLE   
-Get-DiskSpace -ComputerName sqlserver2014a -Unit TB
+Get-DbaDiskSpace -ComputerName sqlserver2014a -Unit TB
 
 Shows disk space for sqlserver2014a in TB
 
 .EXAMPLE   
-Get-DiskSpace -ComputerName server1, server2, server3 -Unit MB
+Get-DbaDiskSpace -ComputerName server1, server2, server3 -Unit MB
 
 Returns a custom object filled with information for server1, server2 and server3, in MB
 	
diff --git a/functions/Set-DBAPowerPlan.ps1 b/functions/Set-DbaPowerPlan.ps1
similarity index 93%
rename from functions/Set-DBAPowerPlan.ps1
rename to functions/Set-DbaPowerPlan.ps1
index 064a7eb557..d5485369da 100644
--- a/functions/Set-DBAPowerPlan.ps1
+++ b/functions/Set-DbaPowerPlan.ps1
@@ -1,4 +1,4 @@
-Function Set-DBAPowerPlan
+Function Set-DbaPowerPlan
 {
 <#
 .SYNOPSIS
@@ -40,15 +40,15 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 .LINK
-https://dbatools.io/Set-DBAPowerPlan
+https://dbatools.io/Set-DbaPowerPlan
 
 .EXAMPLE
-Set-DBAPowerPlan -ComputerName sqlserver2014a
+Set-DbaPowerPlan -ComputerName sqlserver2014a
 
 To return true or false for Power Plan being set to High Performance
 	
 .EXAMPLE   
-Set-DBAPowerPlan -ComputerName sqlserver2014a -Detailed
+Set-DbaPowerPlan -ComputerName sqlserver2014a -Detailed
 	
 To return detailed information Power Plans
 	
@@ -67,7 +67,7 @@ To return detailed information Power Plans
 	{
 		if ($CustomPowerPlan.Length -gt 0) { $PowerPlan = $CustomPowerPlan }
 		
-		Function Set-DBAPowerPlan
+		Function Set-DbaPowerPlan
 		{
 			try
 			{
@@ -146,8 +146,8 @@ To return detailed information Power Plans
 		{
 			if ($server -match 'Server\=')
 			{
-				Write-Verbose "Matched that value was piped from Test-DBAPowerPlan"
-				# I couldn't properly unwrap the output from  Test-DBAPowerPlan so here goes.
+				Write-Verbose "Matched that value was piped from Test-DbaPowerPlan"
+				# I couldn't properly unwrap the output from  Test-DbaPowerPlan so here goes.
 				$lol = $server.Split("\;")[0]
 				$lol = $lol.TrimEnd("\}")
 				$lol = $lol.TrimStart("\@\{Server")
@@ -170,7 +170,7 @@ To return detailed information Power Plans
 				continue
 			}
 			
-			$data = Set-DBAPowerPlan $server
+			$data = Set-DbaPowerPlan $server
 			
 			if ($data.Count -gt 1)
 			{
diff --git a/functions/Test-DBADiskAllocation.ps1 b/functions/Test-DbaDiskAllocation.ps1
similarity index 96%
rename from functions/Test-DBADiskAllocation.ps1
rename to functions/Test-DbaDiskAllocation.ps1
index fe43a86b5a..e60a064c49 100644
--- a/functions/Test-DBADiskAllocation.ps1
+++ b/functions/Test-DbaDiskAllocation.ps1
@@ -1,4 +1,4 @@
-Function Test-DBADiskAllocation
+Function Test-DbaDiskAllocation
 {
 <#
 .SYNOPSIS
@@ -38,20 +38,20 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 .LINK
-https://dbatools.io/Test-DBADiskAllocation
+https://dbatools.io/Test-DbaDiskAllocation
 
 .EXAMPLE
-Test-DBADiskAllocation -ComputerName sqlserver2014a
+Test-DbaDiskAllocation -ComputerName sqlserver2014a
 
 To return true or false for any disk not being formatted to 64k
 
 .EXAMPLE   
-Test-DBADiskAllocation -ComputerName sqlserver2014 -Detailed
+Test-DbaDiskAllocation -ComputerName sqlserver2014 -Detailed
 	
 To return detailed information about disks containing SQL data from any instance being formatted to 64k
 	
 .EXAMPLE   
-Test-DBADiskAllocation -ComputerName sqlserver2014a -NoSqlCheck
+Test-DbaDiskAllocation -ComputerName sqlserver2014a -NoSqlCheck
 
 To return true or false for ALL disks being formatted to 64k
 	
diff --git a/functions/Test-DBAPowerPlan.ps1 b/functions/Test-DbaPowerPlan.ps1
similarity index 95%
rename from functions/Test-DBAPowerPlan.ps1
rename to functions/Test-DbaPowerPlan.ps1
index d07d88bf40..f8d0fb5912 100644
--- a/functions/Test-DBAPowerPlan.ps1
+++ b/functions/Test-DbaPowerPlan.ps1
@@ -1,4 +1,4 @@
-Function Test-dbaPowerPlan
+Function Test-DbaPowerPlan
 {
 <#
 .SYNOPSIS
@@ -35,20 +35,20 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 .LINK
-https://dbatools.io/Test-dbaPowerPlan
+https://dbatools.io/Test-DbaPowerPlan
 
 .EXAMPLE
-Test-dbaPowerPlan -ComputerName sqlserver2014a
+Test-DbaPowerPlan -ComputerName sqlserver2014a
 
 To return true or false for Power Plan being set to High Performance
 
 .EXAMPLE   
-Test-dbaPowerPlan -ComputerName sqlserver2014a -CustomPowerPlan 'Maximum Performance'
+Test-DbaPowerPlan -ComputerName sqlserver2014a -CustomPowerPlan 'Maximum Performance'
 	
 To return true or false for Power Plan being set to the custom power plan called Maximum Performance
 	
 .EXAMPLE   
-Test-dbaPowerPlan -ComputerName sqlserver2014a -Detailed
+Test-DbaPowerPlan -ComputerName sqlserver2014a -Detailed
 	
 To return detailed information Power Plans