Simple fixes for naming