[WIP] Apply new name into everything