Updated class names to avoid future conflicts similar to the one we had
with the 'Method' class