fix some naming conventions