#450 Corrected var names