Updated to rename avatar methods'