did some renaming, started on HLL (not working yet)