renamed classes with new prefix