sanity rename
minor changes