Rename class
Some wrapper classes