Remove natural naming warnings