Consistent naming tidy