Fixing names to adhere to wp standards