Renamed cross-platform units