remove redundant naming conventions