rename issues from Rosewright fixed