Remove duplicate methods and remove Message suffix from MessageContainerInterface methods