Rename classes to avoid confusion
Rename files from last commit