internal naming changes
comment update