Adds a couple of missing service keys references. Changes the default alias naming scheme.