Improved namespace on classes.