Uppercase class files
Clarify cbs
Renaming retrieve to fetch
Make sure callbacks aren't fired twice