Fixed placeholders with proper name