renaming classes to uppercase, fix some runtime/"compile" issues