Comply with new naming standards