STY: Cleaner names