update naming and paths