* Minor reformatting
        * Test for issue #7
        * Correct implementation of naming rules for rename declarations
        * Update reference outputs