Small renaming fixes