#5 #6 Fixes class names