Cleaned up URL naming convention.