Clean up on isle 5... name changes, a bug fix.