Fixed crash

Made naming comply with coding conventions