Better description
Class rename