Set method and more renaming