Make the namespace variable more standard

Make the namespace variable more standard, and keep conformity