Cleaning up signLabel and related naming issues