Cleaned up name handling.