Replace all instances of close with destroy
Normalize "Types" to "Classes"