Make model namespace safe