some names changes (new package common.db) no code changes