Fixed references to new 'common' package.