reverted some naming changes