[working] typos and rename