Updated namespace name and include guards