Adds the rest of the placeholders, and fixes naming.