Fix butterVersion issues reverted in rebase rename