QOL naming improvements