update todo items and separate naming conversions to _notes