Cleaned up names of methods in charts