Various naming improvements.