Ensure safe property and variable names.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>