Added Teaspoon and cleaned up coffee script names