No more need for renames
Abstract version