Rename class
Fix bugs