Changing Class names... no more lowercase classes!