Pre release2

- Renamed classes to use `--` instead of `__` to be more consistent with the rest of Timber