revert to using shortcut names of Rubinius ToolSet classes