Slight code cleanup.
Consistently using string types for label names