Streamline UI naming