Minor changes - renaming