Small renaming and fix