Feature/now 337

Replace `*` with a specific class name.