change to comply naming standards