changed decls to use regular names