diff --git a/transitland/bootstrap.py b/transitland/bootstrap.py
index 9f6f1fb..61fee82 100644
--- a/transitland/bootstrap.py
+++ b/transitland/bootstrap.py
@@ -52,8 +52,7 @@
   kw['debug'] = args.debug
   kw['url'] = args.url
   if args.feedname:
-    # set the feedid with geohash
-    kw['feedid'] = 'f-0-%s'%(args.feedname.lower().strip())
+    kw['feedname'] = args.feedname
   feed = entities.Feed.from_gtfs(f, **kw)
   
   # Print basic feed information.
diff --git a/transitland/feed.py b/transitland/feed.py
index e7170c8..0460cbf 100644
--- a/transitland/feed.py
+++ b/transitland/feed.py
@@ -49,10 +49,10 @@ def from_gtfs(cls, gtfs_feed, feed=None, feedname='unknown', populate=True, debu
     # Create feed
     if feed:
       pass
-    else:
+    else:      
       kw['onestopId'] = 'f-%s-%s'%(
         geom.geohash_features(gtfs_feed.stops()), 
-        feedname
+        cls().mangle(feedname)
       )
       feed = cls(**kw)
     feedid = feed.onestop()