Minor bug fix. Did some major renaming as per Saadiyah's request.