Removed natural naming warnings.