Updated to new namespace (though they don't seem to be used in current drawing code)