fixed renamed classes