unified api view names and fixed a bunch of EI holes/bugs