Rename class name and better property accessing