Some naming improvements-2