fixes class names and vocabulary machine names