Added name into classes