Standardize filenames
Fix missing placeholders