Add string key test
Rename extension classes for EF