Fix some poor naming practices on my part.