Update names to match standards