Attribute re-name (better naming) and comment fix