I'm assuming this file change-of-name is just git weirdness?