Fix clashing imports, align keys