Fix: Triggers should use ref; Cleanup names