Naming consistency

Signed-off-by: emanuele <emanuele45@gmail.com>
Define constants during install if not defined - fixes #1024

Signed-off-by: emanuele <emanuele45@gmail.com>