Options needs to be a table, Actually fix pre-transition naming