Naming changes to meet dart conventions