rename some classes; add enum indexer
add unit test
modify test