Internal naming changes--also split live and replay methods.