a little over-eager with the rename there (+ some cleanup)