TODO tasks: RuboCop and namespace change