0.8.7 alpha 3: refactoring (renaming)