renamed classes name inside files. Refactor missed them...