cleanup, making filename conventions consistent
cleanup file naming conventions