Renamed modules for new cli