removed naming redundancy