sorted out some naming issues