cleanups; use 'base.' namespace