Some naming adjustments.
Incrementing version.
Fixing the setup method.