Improve compatibility

Changed variable names to avoid mess-up with some system variables