Some naming improvements