Class name changes
Merge pull request #2 from drymek/memory

Class name changes