Rename solution for consistency and @bw's sanity