Squish naming/refactor bugs