Using proper naming scheme. Fixes #63