Naming changes to better reflect conventions