Renamed placeholders to patterns, replaced underscores with dashes