Fix quality flaws
Fix wrong plan param renaming by a previous commit