Updated Graphite naming conventions