Final changes to the recording naming code, this should make jhMikeS happy ;)