Fixed subnames, stone trimmed is fixed now