National Geographic Style Manual has moved to
Avoid Muhammadan, Muhammadanism; write Muslim, Islam.
For the spelling of Muhammad in names other than the Prophet's follow an individuals preference or consult a standard reference such as Webster's Biographical Dictionary.