fixed bug in new naming convention