Fix stuff and rename stuff