fix reloading, remove unused code

enum classes should follow default class name conventions (e.g. not consist of capital letters) (only instances should be captialized).