Renaming views to adhere to naming conventions