Making a few changes to placeholders and names