add naming specs. fix code to pass specs.