removed inconsistencies that were caused by changing class names