Change names to comply with install script