Making same changes twice it seems
Merged differences of naming convention