fixup! Added ability to rename features

- Make things fast!