Installation paths

Changed names of installation types and more directly set installation directory variables.