Method and Class name corrections