Rename a few instances
#85 Deprecate _1 to _6 for first to sixth