Rename class and fixed bug