fixture renames
improved move fields