Update custom rake with improved syntax and convention