diff --git a/config/assets.yml b/config/assets.yml
index 623482b29..c4a1f4b3b 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -33,7 +33,7 @@ javascripts:
     - public/javascripts/stream.js
     - public/javascripts/application.js
     - public/javascripts/search.js
-    - public/javascripts/infinite_scroll.js
+    - public/javascripts/infinite-scroll.js
   mobile:
     - public/javascripts/vendor/jquery152.min.js
     - public/javascripts/custom-mobile-scripting.js
@@ -41,7 +41,7 @@ javascripts:
     - public/javascripts/vendor/jquery.infinitescroll.min.js
     - public/javascripts/diaspora.js
     - public/javascripts/widgets/i18n.js
-    - public/javascripts/infinite_scroll.js
+    - public/javascripts/infinite-scroll.js
     - public/javascripts/application.js
     - public/javascripts/rails.js
   mailchimp:
diff --git a/public/javascripts/infinite_scroll.js b/public/javascripts/infinite-scroll.js
similarity index 100%
rename from public/javascripts/infinite_scroll.js
rename to public/javascripts/infinite-scroll.js
diff --git a/spec/javascripts/diaspora-spec.js b/spec/javascripts/diaspora-spec.js
index 9ef9bc06a..d4f4978ea 100644
--- a/spec/javascripts/diaspora-spec.js
+++ b/spec/javascripts/diaspora-spec.js
@@ -44,9 +44,9 @@ describe("Diaspora", function() {
           expect(window.widgets.collection["nameOfWidget"].start).toHaveBeenCalled();
         });
         it("changes the ready property to true", function() {
-          expect(window.widgets.ready).toBeFalsy();
+          expect(window.widgets.initialized).toBeFalsy();
           window.widgets.init();
-          expect(window.widgets.ready).toBeTruthy();
+          expect(window.widgets.initialized).toBeTruthy();
         });
       });
     });
diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml
index 15abb29ae..1c4678eb4 100644
--- a/spec/javascripts/support/jasmine.yml
+++ b/spec/javascripts/support/jasmine.yml
@@ -14,7 +14,7 @@ src_files:
   - public/javascripts/vendor/jquery152.min.js
   - public/javascripts/vendor/jquery-ui-1.8.9.custom.min.js
   - public/javascripts/vendor/jquery.tipsy.js
-  - public/javascripts/vendor/jquery.infieldlabel.js
+  - public/javascripts/jquery.infieldlabel-custom.js
   - public/javascripts/vendor/jquery.autoresize.min.js
   - public/javascripts/vendor/Mustache.js
   - public/javascripts/vendor/charCount.js
@@ -28,6 +28,7 @@ src_files:
   - public/javascripts/widgets/i18n.js
   - public/javascripts/widgets/timeago.js
   - public/javascripts/mobile.js
+  - public/javascripts/infinite-scroll.js
   - public/javascripts/aspect-contacts.js
   - public/javascripts/contact-list.js
   - public/javascripts/web-socket-receiver.js