Namespace fixes for HMC notebook