Replace self.marionette with m where applicable