Rename spec and add server key