Change names to comply with install script and some other stuff