Changed filenames in response to user request and for more consistency.