Fixed old refs to common