Fixes #3 - more appropriate naming