Some tentacle code cleanup.
More artefact names