some naming convention modifications