Remove duplicate definition; add Qualified Package Names