Minor syntax and filename changes