renamed classes to have a prefix