Fix naming and add imports to avoid CS limit